Merge lp:~jillrouleau/charms/trusty/mysql/raise-max-conns-lp1382386 into lp:charms/trusty/mysql

[Jill Rouleau]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3433 mysql for jillrouleau mp303638
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/3433/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2480 mysql for jillrouleau mp303638
    UNIT OK: passed

UNIT Results not found.
Build: http://10.245.162.36:8080/job/charm_unit_test/2480/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #844 mysql for jillrouleau mp303638
    AMULET OK: passed

AMULET Results not found.
Build: http://10.245.162.36:8080/job/charm_amulet_test/844/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #7 mysql for jillrouleau mp303638
    UNIT OK: passed

UNIT Results not found.
Build: http://10.245.162.208:8080/job/charm_unit_test/7/

[Cory Johns (johnsca)]

From the Contribute section of https://jujucharms.com/mysql/, it seems that the mysql charm now lives in https://github.com/marcoceppi/charm-mysql and changes should be submitted as PRs against that.

It also seems that this has a merge conflict, but otherwise the change seems reasonable.

review: Needs Resubmitting

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5413/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5306/

review: Needs Fixing (automated testing)

Unmerged revisions

130. By Jill Rouleau on 2016-08-23

Change max-connections default to 500, for lp:1382386

129. By Tim Van Steenburgh on 2015-01-14

[niedbalski] Trusty to precise <-> syncup

128. By Tim Van Steenburgh on 2014-11-05

[jorge] Update to tags

127. By Marco Ceppi on 2014-11-04

[aisrael] Fix charm proof warnings and lint errors so that the charm will pass automated testing.

=== modified file 'config.yaml'
--- config.yaml	2015-12-30 02:20:40 +0000
+++ config.yaml	2016-08-23 01:20:06 +0000
@@ -24,7 +24,7 @@
         type: int
         description: Override the computed version from dataset-size. Still works if query-cache-type is "OFF" since sessions can override the cache type setting on their own.
     max-connections:
-        default: -1
+        default: 500
         type: int
         description: Maximum connections to allow. -1 means use the server's compiled in default.
     wait-timeout:

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-07-01 20:47:28 +0000
+++ metadata.yaml	2016-08-23 01:20:06 +0000
@@ -6,9 +6,14 @@
   server. SQL (Structured Query Language) is the most popular database query
   language in the world. The main goals of MySQL are speed, robustness and
   ease of use.
+<<<<<<< TREE
 tags:
     - databases
     - openstack
+=======
+tags:
+    - database
+>>>>>>> MERGE-SOURCE
 provides:
   db:
     interface: mysql