Repository: incubator-juneau
Updated Branches:
refs/heads/master 3e1a66855 -> 36f1b535e
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/951a3217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/951a3217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/951a3217
Branch: refs/heads/master
Commit: 951a32170a69d622992edcc5d8c94ebb3dc68abf
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:12:26 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
