← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-135

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-135

Viewing all changes in revision 2607.

Committer: Continuous Integration
Date: 2012-12-18 04:06:25 UTC
mfrom: (2606.1.3 drizzle-7.2)
Revision ID: ci@drizzle.org-20121218040625-zbh74sz2666qh67f

Merge lp:~brianaker/drizzle/dependency-fixes Build: jenkins-Drizzle-Builder-123

files added:
plugin/json_server/tests/disabled

files renamed:
plugin/json_server/tests/t/basic.test => plugin/json_server/tests/disabled/basic.test

files modified:
client/include.am

configure.ac

drizzled/include.am

libdrizzle-1.0/t/include.am

libdrizzle-2.0/include.am

m4/ax_assert.m4

m4/ax_debug.m4

m4/ax_libevent.m4

m4/ax_uuid.m4

m4/ax_vcs_checkout.m4

plugin/innobase/plugin.am

Show diffs side-by-side

added added

removed removed

client/include.am

drizzled/include.am

libdrizzle-1.0/t/include.am

libdrizzle-2.0/include.am

m4/ax_assert.m4

m4/ax_libevent.m4

m4/ax_vcs_checkout.m4

plugin/innobase/plugin.am

plugin/json_server/tests/disabled/

Older »