commit 1
a
b
c
d
e
f
a
comitando revisao amazon 50
a
a
Merge branch 'master' of github.com:alvimiranda/production

Conflicts:
	biserver_48/biserver-ce/data/hsqldb/hibernate.log
	biserver_48/biserver-ce/data/hsqldb/hibernate.properties
	biserver_48/biserver-ce/data/hsqldb/hibernate.script
	biserver_48/biserver-ce/data/hsqldb/quartz.log
	biserver_48/biserver-ce/data/hsqldb/quartz.properties
	biserver_48/biserver-ce/data/hsqldb/quartz.script
	biserver_48/biserver-ce/data/hsqldb/sampledata.log
	biserver_48/biserver-ce/data/hsqldb/sampledata.properties
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/alert.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/alert.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/cdaevent.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/cdaevent.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/cdaevent_queryinfo.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/cdaevent_queryinfo.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/default.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/default.0.oda
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/default.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/default.odh
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/index.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/index.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/internal.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/internal.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/manindex.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/manindex.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/ofunction.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/ofunction.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/org.pentaho.cdf.views.view.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/org.pentaho.cdf.views.view.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/orids.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/orids.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/orole.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/orole.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/ouser.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/ouser.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/query.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/query.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/test.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/test.och
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/testresult.0.ocl
	biserver_48/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/testresult.och
	biserver_48/biserver-ce/pentaho-solutions/system/logs/audit/PentahoAuditLog.log
	biserver_48/biserver-ce/tomcat/logs/catalina.2014-05-29.log
	biserver_48/biserver-ce/tomcat/logs/catalina.out
	biserver_48/biserver-ce/tomcat/logs/localhost.2014-05-29.log
	biserver_48/biserver-ce/tomcat/logs/pentaho.log
	biserver_50/biserver-ce/data/hsqldb/hibernate.properties
	biserver_50/biserver-ce/data/hsqldb/quartz.log
	biserver_50/biserver-ce/data/hsqldb/quartz.properties
	biserver_50/biserver-ce/data/hsqldb/quartz.script
	biserver_50/biserver-ce/data/hsqldb/sampledata.properties
	biserver_50/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/database.ocf
	biserver_50/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/default.0.ocl
	biserver_50/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/default.0.oda
	biserver_50/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/index.0.ocl
	biserver_50/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/index.0.oda
	biserver_50/biserver-ce/pentaho-solutions/system/.orient/webdetails.db/internal.0.ocl
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/repository/index/_11/segments.gen
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/repository/index/_16/_2.prx
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/repository/index/_16/segments_1
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/repository/index/_16/segments_4
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/version/db.h2.db
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/version/db.trace.db
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/workspaces/default/db.h2.db
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/workspaces/default/db.trace.db
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/workspaces/security/db.h2.db
	biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/workspaces/security/db.trace.db
	biserver_50/biserver-ce/pentaho-solutions/system/logs/audit/PentahoAuditLog.log
	biserver_50/biserver-ce/tomcat/logs/catalina.2014-05-29.log
	biserver_50/biserver-ce/tomcat/logs/catalina.out
	biserver_50/biserver-ce/tomcat/logs/localhost.2014-05-29.log
	biserver_50/biserver-ce/tomcat/logs/pentaho.log
	biserver_50/biserver-ce/tomcat/temp/_pentaho-cda/pentaho-cda-dataaccess.data
	biserver_50/biserver-ce/tomcat/temp/_pentaho-cda/pentaho-cda-dataaccess.index

	modified:   biserver_50/biserver-ce/pentaho-solutions/system/jackrabbit/repository/workspaces/security/db.trace.db
	modified:   biserver_50/biserver-ce/pentaho-solutions/system/logs/audit/PentahoAuditLog.log
	modified:   biserver_50/biserver-ce/tomcat/logs/catalina.2014-05-29.log
	modified:   biserver_50/biserver-ce/tomcat/logs/catalina.out
	modified:   biserver_50/biserver-ce/tomcat/logs/localhost.2014-05-29.log
	modified:   biserver_50/biserver-ce/tomcat/logs/pentaho.log
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho-cde/pentaho-cde.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/libloader-data.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/mondrian-catalog-cache.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/org.pentaho.platform.repository.solution.dbbased.RepositoryFile.accessControls.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/org.pentaho.platform.repository.solution.dbbased.RepositoryFile.childrenFiles.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/org.pentaho.platform.repository.solution.dbbased.RepositoryFile.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/pentahoCache.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/pt.webdetails.cpk:d3ComponentLibrary.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/pt.webdetails.cpk:repositorySynchronizer.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/_pentaho/pt.webdetails.cpk:sparkl.data
	deleted:    biserver_50/biserver-ce/tomcat/temp/repoExport4206847655777924514.zip
	deleted:    biserver_50/biserver-ce/tomcat/temp/repoExport4532665876315337980.zip
	deleted:    biserver_50/biserver-ce/tomcat/temp/repoExport4629898086285295498.zip
	deleted:    biserver_50/biserver-ce/tomcat/temp/repoExport6669978823693037191.zip
	deleted:    biserver_50/biserver-ce/tomcat/temp/repoExport6749650250714089688.zip
	deleted:    biserver_50/biserver-ce/tomcat/temp/repoExport6967454290073160954.zip
	deleted:    biserver_50/biserver-ce/tomcat/temp/repoExport7353210924469784358.zip
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile1307564216167790731.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile1348064289187320037.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile1524292039844205380.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile1654240906082257668.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile1793782757925668356.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile2260956804565941464.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile2262821943462697555.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile254100281440672120.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile2667397059594988431.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile3388322064287436133.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile4097696701985070752.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile4584125977079951782.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile4605640737756387841.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile5285294658758725373.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile5454795740350769741.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile6456382932793467386.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile6549544200586998559.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile662623596212020031.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile6657176496603482304.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile6676258142986577556.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile6955515864888586915.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile7427483828131087928.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile7630670741055123349.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile8519920944966102301.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile8869959820814039436.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile8969141443476435100.tmp
	deleted:    biserver_50/biserver-ce/tomcat/temp/tempFile930054007572709902.tmp
	modified:   biserver_50/biserver-ce/pentaho-solutions/system/d3ComponentLibrary (modified content)
	modified:   biserver_50/biserver-ce/pentaho-solutions/system/sparkl (modified content)