[3/4] climate git commit: Merge branch 'master' into CLIMATE-797

2017-12-02 Thread goodman
Merge branch 'master' into CLIMATE-797 Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/3e17f5cd Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/3e17f5cd Diff:

[1/4] climate git commit: CLIMATE-797 Fix attribute error when dataset has no mask attribute

2017-12-02 Thread goodman
Repository: climate Updated Branches: refs/heads/master 2d30ef8ed -> 8cf58f88f CLIMATE-797 Fix attribute error when dataset has no mask attribute Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/41412cae Tree:

[1/4] climate git commit: CLIMATE-936 - Added instructions on where to find input files for the example.

2017-12-02 Thread goodman
Repository: climate Updated Branches: refs/heads/master 8cf58f88f -> 85a4e348d CLIMATE-936 - Added instructions on where to find input files for the example. Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/21ec176d

[2/4] climate git commit: Merge branch 'master' into CLIMATE-936

2017-12-02 Thread goodman
Merge branch 'master' into CLIMATE-936 Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c6d7bf72 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c6d7bf72 Diff:

[4/4] climate git commit: Merge branch 'CLIMATE-936' of https://github.com/MichaelArthurAnderson/climate

2017-12-02 Thread goodman
Merge branch 'CLIMATE-936' of https://github.com/MichaelArthurAnderson/climate Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/85a4e348 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/85a4e348 Diff:

[3/4] climate git commit: Merge branch 'master' into CLIMATE-936

2017-12-02 Thread goodman
Merge branch 'master' into CLIMATE-936 Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/4c523676 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/4c523676 Diff:

[4/4] climate git commit: Fix merge conflict (CLIMATE-465)

2017-12-02 Thread goodman
Fix merge conflict (CLIMATE-465) Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/2d30ef8e Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/2d30ef8e Diff:

[3/4] climate git commit: Merge branch 'master' into CLIMATE-465

2017-12-02 Thread goodman
Merge branch 'master' into CLIMATE-465 Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/da7e5a00 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/da7e5a00 Diff:

[1/4] climate git commit: CLIMATE-465 Add class level documentation and Apache license to examples

2017-12-02 Thread goodman
Repository: climate Updated Branches: refs/heads/master 8b5de9c41 -> 2d30ef8ed CLIMATE-465 Add class level documentation and Apache license to examples Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/7d6f5ae8 Tree:

[2/4] climate git commit: Merge branch 'master' into CLIMATE-465

2017-12-02 Thread goodman
Merge branch 'master' into CLIMATE-465 Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/32ab882f Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/32ab882f Diff: