Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/498716d1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/498716d1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/498716d1 Branch: refs/heads/develop Commit: 498716d124ab4e4221eedb860a2f954cf71eb801 Parents: 118764d 3044c46 Author: Josh Tynjala <joshtynj...@apache.org> Authored: Tue Jan 12 13:11:04 2016 -0800 Committer: Josh Tynjala <joshtynj...@apache.org> Committed: Tue Jan 12 13:11:04 2016 -0800 ---------------------------------------------------------------------- build.xml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) ----------------------------------------------------------------------