Subo lo que llevo escrito de la arquitectura. Mañana terminaré con la red.

 On branch master
 Changes to be committed:

	modified:   Memoria/Arquitectura.lyx
	modified:   Memoria/Memoria.lyx
	modified:   Memoria/Portada.tex
	modified:   Memoria/ch04.bib
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/Bucle reactor.pdf"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/Diagrama estados conexi\303\263n.pdf"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/Diagrama estados conexi\303\263n.vsd"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/DiagramaClasesInteracci\303\263nTwisted.pdf"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/DiagramaClasesJerarqu\303\255aHilosRed.pdf"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/DiagramaClasesNetworkConnection.pdf"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/Twisted_recepci\303\263n.pdf"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/gr\303\241fico_twisted.docx"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/gr\303\241fico_twisted.pdf"
Merge branch 'web_development'
Merge branch 'web_development'
Merge branch 'web_development'
Merge branch 'web_development'
Subo arquitectura de la red terminada.
 On branch master
 Changes to be committed:

	modified:   Memoria/Agradecimientos.lyx
	modified:   Memoria/Arquitectura.lyx
	modified:   Memoria/CloudComputing.lyx
	modified:   Memoria/DescripcionProblema.lyx
	modified:   Memoria/Licencia.lyx
	modified:   Memoria/ManualUsuario.lyx
	modified:   Memoria/Memoria.lyx
	modified:   Memoria/Portada.tex
	modified:   Memoria/Proyecto RSA/CygnusCloud.zip
	modified:   Memoria/Resultados.lyx
	modified:   Memoria/Resumen.lyx
	modified:   Memoria/Virtualizacion.lyx
	modified:   Memoria/ch01.bib
	modified:   Memoria/ch02.bib
	modified:   Memoria/ch03.bib
	modified:   Memoria/ch05.bib
	modified:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/DiagramaClasesInteracci\303\263nTwisted.pdf"
	new file:   "Memoria/graficos/Arquitectura/Vista l\303\263gica/DiagramaClasesNetworkManager.pdf"
	modified:   Memoria/graficos/Cloud computing/.directory
	modified:   Memoria/graficos/Cloud computing/500px-Cloud-Types-Model_copy.png
	modified:   Memoria/graficos/Cloud computing/fin.jpg
	modified:   Memoria/graficos/Cloud computing/generales-foto05.jpg
	modified:   Memoria/graficos/Cloud computing/microsoft-cloud-featured.gif
	modified:   Memoria/graficos/Cloud computing/sparkindark_cloudcomputing-660x495.png
	modified:   Memoria/graficos/Cloud computing/vmware-stratogen-hybrid-cloud-computing-solution.jpg
	modified:   Memoria/graficos/Virtualizacion/completa.png
	modified:   Memoria/graficos/Virtualizacion/hardware.png
	modified:   Memoria/graficos/Virtualizacion/paravirtualizacion.png
	modified:   Memoria/graficos/Virtualizacion/software.png
	modified:   Memoria/graficos/Virtualizacion2/ArqKVM.png
	modified:   Memoria/graficos/Virtualizacion2/ArqXen1.png
	modified:   Memoria/graficos/Virtualizacion2/ArquXen2.png
	modified:   Memoria/graficos/portada/escudo_ucm.png
Merge branch 'web_development'
Merge branch 'web_development'
Merge branch 'infrastructure-upstream'
Merge branch 'issue_bug_registro'
Merge branch 'issues_10_11'
Subo:
- corrección de un bug, que provocaba la lectura de datos de segmentos
  de estado vacíos.
- bases de datos con escritura forzosa.
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/connector/clusterServerConnector.py
	modified:   src/CygnusCloud/clusterServer/connector/webServerEndpoint.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/database/clusterServer/clusterServerDB.py
	modified:   src/CygnusCloud/database/commands/commandsDatabaseConnector.py
	modified:   src/CygnusCloud/database/systemStatusDB/systemStatusDBWriter.py
	modified:   src/CygnusCloud/database/tests/systemStatusDBTests.py
	modified:   src/CygnusCloud/database/tests/vmServerDBTests.py
	modified:   src/CygnusCloud/database/utils/connector.py
	modified:   src/CygnusCloud/virtualMachineServer/packets.py
	modified:   src/CygnusCloud/virtualMachineServer/vmServerCallback.py
Merge branch 'issues_10_11'
Subo funcionalidad del issue #14 implementada.

 On branch issue_14
 Changes to be committed:

	modified:   clusterServer/connector/clusterServerConnector.py
	modified:   clusterServer/reactor/clusterServerReactor.py
	modified:   database/systemStatusDB/systemStatusDBReader.py
	modified:   database/tests/systemStatusDBTests.py
Subo código que he modificado hoy comentado.

 On branch issue_14
 Changes to be committed:

	modified:   network/manager/networkManager.py
	modified:   network/threads/connectionMonitoring.py
	modified:   network/threads/dataProcessing.py
	modified:   network/threads/twistedReactor.py
	modified:   network/twistedInteraction/clientConnection.py
	modified:   network/twistedInteraction/connection.py
	modified:   network/twistedInteraction/connectionStatus.py
	modified:   network/twistedInteraction/protocols.py
	modified:   network/twistedInteraction/serverConnection.py
Merge branch 'issue_14' into infrastructure-upstream