Merge remote-tracking branch 'upstream/master'

2013-04-18 14:19:32 -04:00
parent a3c8b09547 eea4232564
commit f8c5e464f9
18 changed files with 771 additions and 254 deletions
@@ -16,6 +16,6 @@ var config = new Settings(
  kibana_index:   "kibana-int", 
  modules:        ['histogram','map','map2','pie','table','stringquery','sort',
                  'timepicker','text','fields','hits','dashcontrol',
-                  'column'], 
+                  'column', 'parallelcoordinates'],
  }
 );