Merge lp:~bigdata-dev/charms/bundles/apache-analytics-sql/trunk into lp:~charmers/charms/bundles/apache-analytics-sql/bundle

[Kevin W Monroe]

Bump plugin revno to pin charm-benchmark. Newer charm-benchmark updates charmhelpers to a version that is incompatible with the plugin's CH fork. Also bumping slave constraint to match masters.

[Cory Johns (johnsca)]

+1

review: Approve

=== modified file 'bundle-dev.yaml'
--- bundle-dev.yaml	2015-10-07 17:15:28 +0000
+++ bundle-dev.yaml	2015-12-15 20:17:45 +0000
@@ -5,7 +5,7 @@
     annotations:
       gui-x: "300"
       gui-y: "200"
-    constraints: mem=3G
+    constraints: mem=7G
   hdfs-master:
     charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master
     num_units: 1
 
=== modified file 'bundle-local.yaml'
--- bundle-local.yaml	2015-09-17 20:31:00 +0000
+++ bundle-local.yaml	2015-12-15 20:17:45 +0000
@@ -5,7 +5,7 @@
     annotations:
       gui-x: "300"
       gui-y: "200"
-    constraints: mem=3G
+    constraints: mem=7G
   hdfs-master:
     charm: apache-hadoop-hdfs-master
     num_units: 1
 
=== modified file 'bundle.yaml'
--- bundle.yaml	2015-10-07 21:29:38 +0000
+++ bundle.yaml	2015-12-15 20:17:45 +0000
@@ -5,7 +5,7 @@
     annotations:
       gui-x: "300"
       gui-y: "200"
-    constraints: mem=3G
+    constraints: mem=7G
   hdfs-master:
     charm: cs:trusty/apache-hadoop-hdfs-master-9
     num_units: 1
@@ -29,7 +29,7 @@
       gui-x: "1200"
       gui-y: "450"
   plugin:
-    charm: cs:trusty/apache-hadoop-plugin-8
+    charm: cs:trusty/apache-hadoop-plugin-9
     annotations:
       gui-x: "900"
       gui-y: "200"