[iscsi-initiator-utils/f19: 15/15] Merge remote-tracking branch 'rhel/rhel-7.0'
Chris Leech
cleech at fedoraproject.org
Mon Apr 14 18:21:41 UTC 2014
commit f8da4ee7c16e29c48028436464921e7317d32a2f
Merge: 5d97fd1 fbd8563
Author: Chris Leech <cleech at redhat.com>
Date: Mon Apr 14 09:54:08 2014 -0700
Merge remote-tracking branch 'rhel/rhel-7.0'
Conflicts:
0146-idbw_rec_write-pick-tpgt-from-existing-record.patch
0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
iscsi-initiator-utils.spec
...rrectly-check-for-invalid-hostno-and-flas.patch | 213 +
...-Print-additional-session-info-for-flashn.patch | 74 +
...i-tools-sync-iscsi_if.h-with-kernel-space.patch | 369 +
...3-ISCSISTART-Saved-ibft-boot-info-to-the-.patch | 42 +-
...d-the-extraction-of-the-session-boot-info.patch | 28 +-
...3-ISCSID-Added-iface-content-override-fix.patch | 8 +-
...ols-Bug-fix-on-IPC-address-copy-version-2.patch | 103 +
...dd-support-to-set-ISCSI_FLASHNODE_CHAP_OU.patch | 35 +
...e-x-option-instead-of-v-to-specify-chap_t.patch | 146 +
...n-page-changes-to-use-x-option-for-chap_t.patch | 53 +
...ges-to-use-long-option-index-instead-of-f.patch | 47 +
...d-support-to-set-CHAP-entry-using-host-ch.patch | 590 +
...-Correctly-get-username_in-and-password_i.patch | 37 +
...nges-for-adding-support-to-set-CHAP-entry.patch | 84 +
...-Setup-iface-conf-file-with-all-iface-att.patch | 46 +
...Remove-numbers-used-for-network-parameter.patch | 65 +
...Additional-parameters-for-network-param-s.patch | 122 +
...s-Use-macro-to-set-IPv4-IPv6-IP-addresses.patch | 243 +
...-Use-single-function-to-enable-disable-ne.patch | 220 +
...-Use-single-function-to-set-integer-netwo.patch | 215 +
...-Ignore-network-parameter-if-not-enabled-.patch | 44 +
...-Additional-parameters-for-network-settin.patch | 1445 ++
...-iface-params-should-be-updated-for-node_.patch | 119 +
...i-tools-Let-default-type-of-iface-be-ipv4.patch | 33 +
...ols-Show-iface-params-based-on-iface-type.patch | 310 +
...ded-document-for-description-of-iface-att.patch | 534 +
..._tool-Add-offload-host-statistics-support.patch | 524 +
0055-README-Updated-for-host-statistics.patch | 33 +
...dm.8-Updated-man-page-for-host-statistics.patch | 51 +
...-Fix-the-iscsiadm-help-options-for-host-m.patch | 30 +
...rrection-for-host-mode-options-of-iscsiad.patch | 31 +
...IUIO-Added-tx-doorbell-override-mechanism.patch | 75 +
...ded-fix-for-the-iface.subnet_mask-decodin.patch | 29 +
...ded-fix-for-the-ARP-cache-flush-mechanism.patch | 41 +
...ISCSIUIO-Updated-RELEASE-note-and-version.patch | 102 +
...dated-the-configure-file-to-reflect-the-n.patch |16698 ++++++++++++++++++++
...O-Removed-the-auto-generated-COPYING-file.patch | 701 +
0065-fix-hardened-build-of-iscsiuio.patch | 62 -
0068-iscsiuio-fix-compilation.patch | 23 +
0069-Add-missing-DESTDIR.patch | 44 +
...csi-tools-set-non-negotiated-params-early.patch | 236 +
...x-the-hostno-check-for-stats-submode-of-h.patch | 30 +
0132-iscsiadm-Fix-the-compile-time-warning.patch | 31 +
... 0143-idmb_rec_write-check-for-tpgt-first.patch | 0
...initrd-option-to-set-run-from-initrd-hint.patch | 0
...c_write-seperate-old-and-new-style-writes.patch | 0
..._rec_write-pick-tpgt-from-existing-record.patch | 2 +-
...csid-newroot-command-to-survive-switch_ro.patch | 0
...scsiuio-systemd-socket-activation-support.patch | 0
...-param-parsing-for-advanced-node-creation.patch | 0
...emd-service-files-add-iscsi.service-for-s.patch | 0
...0-iscsi-boot-related-service-file-updates.patch | 0
...patch => 0151-update-initscripts-and-docs.patch | 0
...r-config.patch => 0152-use-var-for-config.patch | 0
...r-name.patch => 0153-use-red-hat-for-name.patch | 0
0054-add-libiscsi.patch => 0154-add-libiscsi.patch | 20 +-
...-use-static.patch => 0155-dont-use-static.patch | 0
...6-remove-the-offload-boot-supported-ifdef.patch | 0
...atch => 0158-iscsiuio-IPC-newroot-command.patch | 0
...patch => 0159-iscsiuio-systemd-unit-files.patch | 0
...tch => 0160-use-systemctl-to-start-iscsid.patch | 0
...-565245-multilib-issues-caused-by-doxygen.patch | 0
...-for-autostart-sessions-if-iscsi-is-not-u.patch | 0
...f-setting-uid-gid-and-drop-supplementary-.patch | 0
...> 0164-libiscsi-fix-incorrect-strncpy-use.patch | 0
0165-fix-hardened-build-of-iscsiuio.patch | 42 +
...tart-socket-listeners-on-iscsiadm-command.patch | 0
...rt-iscsiadm-return-error-when-login-fails.patch | 35 +
0168-update-handling-of-boot-sessions.patch | 55 +
...e-iscsi.service-for-boot-session-recovery.patch | 34 +
...-version-string-to-match-RPM-package-vers.patch | 2 +-
04-iscsi | 2 +-
iscsi-initiator-utils.spec | 181 +-
73 files changed, 24181 insertions(+), 158 deletions(-)
---
diff --cc iscsi-initiator-utils.spec
index ef0c707,be98cd6..eb27ab7
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@@ -297,9 -403,37 +403,16 @@@ f
%{_includedir}/libiscsi.h
%changelog
-* Tue Mar 18 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-21
-- 1069825
++* Mon Apr 14 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-21
+ - boot session handling improvements
-- Fix iscsi-mark-root for changed iscsiadm output
-- Make sure iscsiuio is running for boot session recovery when using the
- bnx2i transport by forcing iscsiuio.service start
-- Make NM dispatch triggered re-check for autostart sessions async
-- Accept exit code 21, no records, from iscsiadm as success in
- iscsi.service
-
-* Tue Feb 25 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-20
-- 1049710 host0 being treated as an invalid in the host stats command
-- 1015563 revert change to return code when calling login_portal for sessions
++- split out iscsiuio into a seperate sub-package
++- sync with new upstream additions
++- revert change to return code when calling login_portal for sessions
+ that already exist, as it impacts users scripting around iscsiadm
+
-* Mon Feb 17 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-19
-- 1007388 fixes for iscsiadm to support qla4xxx
-- refresh boot session info patches to final version from upstream,
- fixes context issues with later patches
-- 1006156, 1006161 Add/Update entries in chap table through Open-iSCSI
-- 948134 extend support to set additional parameters for network configuration
-- 1049710 update open-iscsi to support host statistics
-- 1043019 iscsiuio fix for arp cache flush issue
-- 1059332 Fix broken discovery sessions over iser
-- 1017393 split out iscsiuio into a seperate sub-package
-
-* Fri Jan 24 2014 Daniel Mach <dmach at redhat.com> - 6.2.0.873-18
-- Mass rebuild 2014-01-24
-
-* Fri Dec 27 2013 Daniel Mach <dmach at redhat.com> - 6.2.0.873-17
-- Mass rebuild 2013-12-27
+* Tue Dec 10 2013 Chris Leech <cleech at redhat.com> - 6.2.0.873-17
+- fix regression in glob use, inappropriate error code escape
+- clean up dead node links from discovery when reusing tpgt
* Mon Nov 25 2013 Chris Leech <cleech at redhat.com> - 6.2.0.873-16
- fix iscsiuio socket activation
More information about the scm-commits
mailing list