Repository: incubator-juneau
Updated Branches:
refs/heads/master 3b989d60f -> 4cf407264 (forced update)
Merge remote-tracking branch 'origin/master'
Conflicts:
juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/4cf40726
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/4cf40726
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/4cf40726
Branch: refs/heads/master
Commit: 4cf407264b1b7029f00fc9e57ca0058694d2d050
Parents: a91a56f cb4a4f2
Author: jamesbognar <[email protected]>
Authored: Sat Aug 27 11:58:25 2016 -0400
Committer: jamesbognar <[email protected]>
Committed: Sat Aug 27 12:15:27 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
