Merge branch '149'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f72430e0 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f72430e0 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f72430e0 Branch: refs/heads/master Commit: f72430e0074fc28fe1f3a3a61a52cb4d43373661 Parents: 15d6d2f 3c3c95c Author: Andrus Adamchik <and...@objectstyle.com> Authored: Sun Dec 11 14:35:03 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Sun Dec 11 14:35:03 2016 +0300 ---------------------------------------------------------------------- .travis.yml | 6 ++--- .../src/test/resources/simplelogger.properties | 24 -------------------- pom.xml | 6 +++++ 3 files changed, 9 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72430e0/.travis.yml ---------------------------------------------------------------------- diff --cc .travis.yml index f555401,b749010..5ae1b17 --- a/.travis.yml +++ b/.travis.yml @@@ -13,7 -13,7 +13,7 @@@ # See the License for the specific language governing permissions and # limitations under the License. - # Since 4GB not enought for build, we use 'sudo' environment with 7.5GB RAM -# Since 4GB not enough for build, we use 'sudo' environment with 7.5GB RAM ++# Since 4GB is not enough for the build, we use 'sudo' environment with 7.5GB RAM # Downside: It's starts a little bit slower # How to fix: Change build setting or fix code. # https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72430e0/pom.xml ----------------------------------------------------------------------
