From b53e1ed17775eea0b32cd68f4badfb354ee5842b Mon Sep 17 00:00:00 2001
From: nopedial <sam@arahant.net>
Date: Fri, 5 Feb 2016 22:15:12 +0000
Subject: version 0.12.0

---
 CHANGELOG.md                | 12 ++++++++++++
 lib/oxidized/input/ssh.rb   |  5 ++++-
 lib/oxidized/model/iosxr.rb |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 685d6d0..a853d31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 0.12.0
+- FEATURE: enhance AOSW (by @mikebryant)
+- FEATURE: F5 TMOS support (by @mikebryant)
+- FEATURE: Opengear support (by @mikebryant)
+- FEATURE: EdgeSwitch support (by @doogieconsulting)
+- BUGFIX: rename input debug log files
+- BUGFIX: powerconnect model fixes (by @Madpilot0)
+- BUGFIX: fortigate model fixes (by @ElvinEfendi) 
+- BUGFIX: various (by @mikebryant)
+- BUGFIX: write SSH debug to file without buffering
+- BUGFIX: fix IOS XR prompt handling
+
 # 0.11.0
 - FEATURE: ssh proxycommand (by @ElvinEfendi)
 - FEATURE: basic auth in HTTP source (by @laf)
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 69b36b0..aab1dc8 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -79,7 +79,10 @@ module Oxidized
     def shell_open ssh
       @ses = ssh.open_channel do |ch|
         ch.on_data do |_ch, data|
-          @log.print data if Oxidized.config.input.debug?
+          if Oxidized.config.input.debug?
+            @log.print data
+            @log.fsync
+          end
           @output << data
           @output = @node.model.expects @output
         end
diff --git a/lib/oxidized/model/iosxr.rb b/lib/oxidized/model/iosxr.rb
index 6887217..a622b66 100644
--- a/lib/oxidized/model/iosxr.rb
+++ b/lib/oxidized/model/iosxr.rb
@@ -2,7 +2,7 @@ class IOSXR < Oxidized::Model
 
   # IOS XR model #
 
-  prompt /^([\w.@:\/-]+[#>]\s?)$/
+  prompt /^(\r?[\w.@:\/-]+[#>]\s?)$/
   comment  '! '
 
   cmd :all do |cfg|
-- 
cgit v1.2.1