[sblim-cmpi-syslog: 2/2] Merge remote-tracking branch 'origin/f19'

[Tomas Bzatek]

commit 7070edb16c288150e2aab686bda6c099a28b6306
Merge: c15f8e3 a1ca73d
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Jul 26 14:13:30 2013 +0200

    Merge remote-tracking branch 'origin/f19'
    
    Conflicts:
    	sblim-cmpi-syslog.spec

 .gitignore                                         |    1 +
 ...slog-0.8.0-Syslog_MessageLog-memory-array.patch |  121 ---
 ...og-0.8.0-Syslog_Setting-instance-deletion.patch |  284 -------
 ...syslog-0.8.0-Syslog_Setting-write-support.patch |  824 --------------------
 ...-cmpi-syslog-0.8.0-add-filter-definitions.patch |  276 -------
 ...0.8.0-allow-Syslog_Setting-Priority-empty.patch |   86 --
 sblim-cmpi-syslog-0.8.0-compiler-warnings.patch    |   57 --
 sblim-cmpi-syslog-0.8.0-crash-zero-arguments.patch |   48 --
 ...cmpi-syslog-0.8.0-cross-filesystem-rename.patch |  121 ---
 sblim-cmpi-syslog-0.8.0-missing-ConfInFile.patch   |   88 ---
 ...yslog-0.8.0-parse-includes-Syslog_Setting.patch |   73 --
 ...-cmpi-syslog-0.8.0-parse-rsyslog-includes.patch |  114 ---
 sblim-cmpi-syslog-0.8.0-systemd.patch              |   61 --
 sblim-cmpi-syslog-0.8.0-unset-properties.patch     |  150 ----
 sblim-cmpi-syslog.spec                             |   41 +-
 sources                                            |    2 +-
 16 files changed, 9 insertions(+), 2338 deletions(-)
---
diff --cc sblim-cmpi-syslog.spec
index fdc6a96,ef4c079..e770390
--- a/sblim-cmpi-syslog.spec
+++ b/sblim-cmpi-syslog.spec
@@@ -223,9 -193,9 +193,12 @@@ f
  %postun -p /sbin/ldconfig
  
  %changelog
+ * Fri Jul 26 2013 Tomas Bzatek <tbzatek at redhat.com> - 0.9.0-1
+ - Update to sblim-cmpi-syslog-0.9.0
+ 
 +* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 0.8.0-11.20120315cvs
 +- Perl 5.18 rebuild
 +
  * Mon Jul 01 2013 Tomas Bzatek <tbzatek at redhat.com> - 0.8.0-10.20120315cvs
  - Add support for rsyslog $IncludeConfig directive (#971807)
  - Add support for filter definitions (#971807)