Merge branch 'master' into epel7

.gitignore

@@ -3,3 +3,4 @@
 /netCDF4-1.0.7.tar.gz
 /v1.0.8rel.tar.gz
 /netcdf4-python-1.0.9-92c0a1c.tar.gz
+/netcdf4-python-1.1.0-26cdeda.tar.gz

netcdf4-python.spec

@@ -6,11 +6,11 @@
 
 %global srcname distribute
 # Get hash for release from https://github.com/Unidata/netcdf4-python/releases
-%global commit 92c0a1ca62b22d4173622122226c060de3c063c6
+%global commit 26cdeda69a3ff2efe438020390a876234a23550a
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           netcdf4-python
-Version:        1.0.9
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        Python/numpy interface to netCDF
 
@@ -162,6 +162,15 @@ PYTHONPATH=$(echo ../build/lib.*) python3 run_all.py
 
 
 %changelog
+* Wed Jul 9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.1.0-1
+- Update to 1.1.0
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.0.9-2
+- Rebuild for Python 3.4
+
 * Fri May 9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.0.9-1
 - Update to 1.0.9
 - Remove rpaths

sources

@@ -1 +1 @@
-930a3dd9ede970030b192b1e94b6c602  netcdf4-python-1.0.9-92c0a1c.tar.gz
+29f818e05d6cc71f640ec76bb23ea83a  netcdf4-python-1.1.0-26cdeda.tar.gz