Clone
mattieubro <mattbrown@hp.com>
committed
on 20 Jun 15
Merge remote branch 'log4cxx/temp-merge' into migrate_log4cpp_to_log4cxx
Conflicts:
core/log4cpp/.gitignore
core/log4cpp/log4cpp-1.1.1/COP… Show more
Merge remote branch 'log4cxx/temp-merge' into migrate_log4cpp_to_log4cxx

Conflicts:

        core/log4cpp/.gitignore

        core/log4cpp/log4cpp-1.1.1/COPYING

        core/log4cpp/log4cpp-1.1.1/ChangeLog

        core/log4cpp/log4cpp-1.1.1/include/.cvsignore

        core/log4cpp/log4cpp-1.1.1/include/Makefile.am

        core/log4cpp/log4cpp-1.1.1/include/Makefile.in

        core/log4cpp/log4cpp-1.1.1/include/config.h.in

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/.cvsignore

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/AbortAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Appender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/AppenderSkeleton.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/AppendersFactory.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/BasicConfigurator.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/BasicLayout.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/BufferingAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Category.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/CategoryStream.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Configurator.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Export.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/FactoryParams.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/FileAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Filter.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/FixedContextCategory.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/HierarchyMaintainer.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/IdsaAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Layout.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/LayoutAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/LayoutsFactory.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/LevelEvaluator.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/LoggingEvent.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Makefile.am

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Makefile.in

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Manipulator.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/NDC.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/NTEventLogAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/OstreamAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/PassThroughLayout.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/PatternLayout.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Portability.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Priority.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/PropertyConfigurator.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/RemoteSyslogAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/RollingFileAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/SimpleConfigurator.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/SimpleLayout.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/SmtpAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/StringQueueAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/SyslogAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/TimeStamp.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/TriggeringEventEvaluator.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/TriggeringEventEvaluatorFactory.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/Win32DebugAppender.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/config-MinGW32.h

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/config-openvms.h

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/config-win32-stlport-boost.h

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/config.h

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/convenience.h

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/BoostThreads.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/DummyThreads.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/MSThreads.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/Makefile.am

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/Makefile.in

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/OmniThreads.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/PThreads.hh

        core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/Threading.hh

        core/log4cpp/log4cpp-1.1.1/src/.cvsignore

        core/log4cpp/log4cpp-1.1.1/src/AbortAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/Appender.cpp

        core/log4cpp/log4cpp-1.1.1/src/AppenderSkeleton.cpp

        core/log4cpp/log4cpp-1.1.1/src/AppendersFactory.cpp

        core/log4cpp/log4cpp-1.1.1/src/BasicConfigurator.cpp

        core/log4cpp/log4cpp-1.1.1/src/BasicLayout.cpp

        core/log4cpp/log4cpp-1.1.1/src/BufferingAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/Category.cpp

        core/log4cpp/log4cpp-1.1.1/src/CategoryStream.cpp

        core/log4cpp/log4cpp-1.1.1/src/Configurator.cpp

        core/log4cpp/log4cpp-1.1.1/src/DllMain.cpp

        core/log4cpp/log4cpp-1.1.1/src/DummyThreads.cpp

        core/log4cpp/log4cpp-1.1.1/src/FactoryParams.cpp

        core/log4cpp/log4cpp-1.1.1/src/FileAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/Filter.cpp

        core/log4cpp/log4cpp-1.1.1/src/FixedContextCategory.cpp

        core/log4cpp/log4cpp-1.1.1/src/HierarchyMaintainer.cpp

        core/log4cpp/log4cpp-1.1.1/src/IdsaAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/LayoutAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/LayoutsFactory.cpp

        core/log4cpp/log4cpp-1.1.1/src/LevelEvaluator.cpp

        core/log4cpp/log4cpp-1.1.1/src/Localtime.cpp

        core/log4cpp/log4cpp-1.1.1/src/Localtime.hh

        core/log4cpp/log4cpp-1.1.1/src/LoggingEvent.cpp

        core/log4cpp/log4cpp-1.1.1/src/MSThreads.cpp

        core/log4cpp/log4cpp-1.1.1/src/Makefile

        core/log4cpp/log4cpp-1.1.1/src/Makefile.am

        core/log4cpp/log4cpp-1.1.1/src/Makefile.in

        core/log4cpp/log4cpp-1.1.1/src/Manipulator.cpp

        core/log4cpp/log4cpp-1.1.1/src/NDC.cpp

        core/log4cpp/log4cpp-1.1.1/src/NTEventLogAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/OmniThreads.cpp

        core/log4cpp/log4cpp-1.1.1/src/OstreamAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/PThreads.cpp

        core/log4cpp/log4cpp-1.1.1/src/PassThroughLayout.cpp

        core/log4cpp/log4cpp-1.1.1/src/PatternLayout.cpp

        core/log4cpp/log4cpp-1.1.1/src/PortabilityImpl.cpp

        core/log4cpp/log4cpp-1.1.1/src/PortabilityImpl.hh

        core/log4cpp/log4cpp-1.1.1/src/Priority.cpp

        core/log4cpp/log4cpp-1.1.1/src/Properties.cpp

        core/log4cpp/log4cpp-1.1.1/src/Properties.hh

        core/log4cpp/log4cpp-1.1.1/src/PropertyConfigurator.cpp

        core/log4cpp/log4cpp-1.1.1/src/PropertyConfiguratorImpl.cpp

        core/log4cpp/log4cpp-1.1.1/src/PropertyConfiguratorImpl.hh

        core/log4cpp/log4cpp-1.1.1/src/RemoteSyslogAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/RollingFileAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/SimpleConfigurator.cpp

        core/log4cpp/log4cpp-1.1.1/src/SimpleLayout.cpp

        core/log4cpp/log4cpp-1.1.1/src/SmtpAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/StringQueueAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/StringUtil.cpp

        core/log4cpp/log4cpp-1.1.1/src/StringUtil.hh

        core/log4cpp/log4cpp-1.1.1/src/SyslogAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/TimeStamp.cpp

        core/log4cpp/log4cpp-1.1.1/src/TriggeringEventEvaluatorFactory.cpp

        core/log4cpp/log4cpp-1.1.1/src/Win32DebugAppender.cpp

        core/log4cpp/log4cpp-1.1.1/src/macros.gmk

        core/log4cpp/log4cpp-1.1.1/src/snprintf.c

        core/log4cpp/log4cpp-1.1.1/src/verslib.h

        core/log4cpp/log4cpp-1.1.1/src/verslog4cpplib.cpp

        core/sqf/conf/log4cpp.monitor.mon.config

        core/sqf/conf/log4cpp.monitor.mon.snmp.config

        core/sqf/conf/log4cpp.monitor.psd.config

        core/sqf/conf/log4cpp.monitor.wdg.config

        core/sqf/conf/log4cpp.monitor.wdg.snmp.config

        core/sqf/conf/log4cpp.trafodion.lob.config

        core/sqf/conf/log4cpp.trafodion.masterexe.config

        core/sqf/conf/log4cpp.trafodion.sscp.config

        core/sqf/conf/log4cpp.trafodion.ssmp.config

        core/sqf/conf/log4cpp.trafodion.tm.config

        core/sqf/conf/log4cpp.trafodion.udr.config

        core/sql/bin/vers_log4cpp.cpp

        sql/bin/vers_log4cpp.cpp

        sql/bin/vers_log4cxx.cpp

Show less

master + 8 more