Resync master/dev branches (#46)

* Sat63 fixes (#38)

* New methods for Sat 6.3 yum export
* Fix to puppet exporter to handle backend_id
* Fix for 6.3 file exports
* Fix DoV export for 6.3
* Count DRPMs as well as RPMs
* Update README

* Version bump to 1.2.3

* Update CHANGELOG.md

* Patch applied for Issues 42 and 43

* Add split size option

* Remove diff file

CHANGELOG.md

@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - sat_export did not handle new backend_identifier value generated by Sat 6.3
+<<<<<<< HEAD
+=======
 
 
 ## [1.2.3] - 2018-03-12
@@ -27,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - sat_export did not handle new backend_identifier value generated by Sat 6.3
+>>>>>>> master
 
 
 ## [1.2.2] - 2018-02-25

sat_export.py

@@ -51,7 +51,14 @@ def get_cv(org_id):
 
             # Return the ID (should be '1') and the label (forms part of the export path name)
             return cv_result['id'], cv_ver, cv_result['label']
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
 
+>>>>>>> master
+=======
+
+>>>>>>> e2448ba67fb918a5a4a04d1d3811f9f91b579239
 
 # Promote a content view version
 def export_cv(dov_ver, last_export, export_type):
@@ -1143,12 +1150,15 @@ def main(args):
                         backend_id = repo_result['backend_identifier']
                     else:
                         backend_id = repo_result['label']
+<<<<<<< HEAD
+=======
 
                     # Satellite 6.3 uses a new backend_identifier key in the API result
                     if 'backend_identifier' in repo_result:
                         backend_id = repo_result['backend_identifier']
                     else:
                         backend_id = repo_result['label']
+>>>>>>> master
 
                     if ok_to_export:
                         # Trigger export on the repo